From ae1b08f77377f260b7b08670de6ac03cf2590cad Mon Sep 17 00:00:00 2001
From: "kaf24@scramble.cl.cam.ac.uk" <kaf24@scramble.cl.cam.ac.uk>
Date: Wed, 2 Mar 2005 18:01:12 +0000
Subject: [PATCH] bitkeeper revision 1.1236.1.47
 (4225ff68LvKUt73k78dKjnXxsnQt7A)

Fix tools build. Clean up barrier defs.
Signed-off-by: Jerone Young <jyoung5@us.ibm.com>
Signed-off-by: Keir Fraser <keir.fraser@cl.cam.ac.uk>
---
 tools/blktap/blktaplib.h |  3 +--
 tools/libxc/xc.h         | 12 ++++++------
 2 files changed, 7 insertions(+), 8 deletions(-)

diff --git a/tools/blktap/blktaplib.h b/tools/blktap/blktaplib.h
index 2cdf48165c..4a46929a63 100644
--- a/tools/blktap/blktaplib.h
+++ b/tools/blktap/blktaplib.h
@@ -8,8 +8,7 @@
 #ifndef __BLKTAPLIB_H__
 #define __BLKTAPLIB_H__
 
-#include <stdint.h>
-
+#include <xc.h>
 #include <sys/user.h>
 #include <xen/xen.h>
 #include <xen/io/blkif.h>
diff --git a/tools/libxc/xc.h b/tools/libxc/xc.h
index 3b587e923f..a11cbe64a6 100644
--- a/tools/libxc/xc.h
+++ b/tools/libxc/xc.h
@@ -25,18 +25,18 @@ typedef int64_t            s64;
 #include <xen/event_channel.h>
 #include <xen/sched_ctl.h>
 
-
 /*
  *  DEFINITIONS FOR CPU BARRIERS
  */ 
 
 #if defined(__i386__)
-#define rmb() __asm__ __volatile__ ("lock; addl $0,0(%%esp)" : : : "memory")
-#define wmb() __asm__ __volatile__ ("" : : : "memory")
+#define mb()  __asm__ __volatile__ ( "lock; addl $0,0(%%esp)" : : : "memory" )
+#define rmb() __asm__ __volatile__ ( "lock; addl $0,0(%%esp)" : : : "memory" )
+#define wmb() __asm__ __volatile__ ( "" : : : "memory")
 #elif defined(__x86_64__)
-#define mb()     asm volatile("mfence":::"memory")
-#define rmb()    asm volatile("lfence":::"memory")
-#define wmb()    asm volatile( "" :::"memory")
+#define mb()  __asm__ __volatile__ ( "mfence" : : : "memory")
+#define rmb() __asm__ __volatile__ ( "lfence" : : : "memory")
+#define wmb() __asm__ __volatile__ ( "" : : : "memory")
 #else
 #error "Define barriers"
 #endif
-- 
2.30.2